Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Tue, 30 Aug 2011 22:44:26 +0000 (18:44 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 30 Aug 2011 22:44:26 +0000 (18:44 -0400)
commitfdfe4b10d12ea5de89fd83399cb6c9a12043479d
tree5838b40a90522c70f7d16e4831225c6a82516fcd
parentb78bba84083ced0c5dba88870d5f173c0d0137db
parent087cd1327e6a22c9299fe5509bad0f7b443ec9da
Merge changes from emacs-23 branch